Merge branch 'upstream-cvs' into upstream-experimental
authorBernd Zeimetz <bernd@bzed.de>
Tue, 7 Apr 2009 16:04:38 +0000 (18:04 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 7 Apr 2009 16:04:38 +0000 (18:04 +0200)

Trivial merge